Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from dotnet/sdk #9119

Merged
merged 11 commits into from
Aug 5, 2024

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jul 18, 2024

This pull request updates the following dependencies

From https://github.com/dotnet/sdk

  • Subscription: 0d610a08-4874-477f-b4d5-08dc8b6aad52
  • Build: 20240726.5
  • Date Produced: July 26, 2024 10:41:53 AM UTC
  • Commit: ea13b1adbfbfe155ae242d42bff7febee0dbb27f
  • Branch: refs/heads/main

VS.Tools.Net.Core.SDK.Resolver
 From Version 9.0.100-preview.7.24367.21 -> To Version 9.0.100-preview.7.24368.3
This partially reverts commit 580166e.
@jonathanpeppers
Copy link
Member

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

Copy link
Member

@jonathanpeppers jonathanpeppers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I reverted all the workarounds in 580166e.

I'll keep trying newer bumps each day until those are fixed.

VS.Tools.Net.Core.SDK.Resolver
 From Version 9.0.100-preview.7.24367.21 -> To Version 9.0.100-preview.7.24368.5
@grendello
Copy link
Contributor

grendello commented Jul 22, 2024

This update (as well as 580166e) break local workload resolution on Linux:

bin/Debug/dotnet/sdk/9.0.100-preview.7.24368.5/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.ImportWorkloads.targets(38,5): error NETSDK1147: 
  To build this project, the following workloads must be installed: android
  To install these workloads, run the following command: dotnet workload restore

Looking at msbuild logs, it appears to ignore location of our freshly built and installed in-tree workload:

Importing project "...bin/Debug/dotnet/sdk-manifests/9.0.100-preview.6/microsoft.net.sdk.android/34.99.0-preview.6.340/WorkloadManifest.targets" into project "...bin/Debug/dotnet/sdk/9.0.100-preview.7.24367.21/Sdks/Microsoft.NET.Sdk/targets/Microsoft.NET.Sdk.ImportWorkloads.targets" at (16,3).
The "DefaultSdkResolver" resolver attempted to resolve the SDK "Microsoft.Android.Sdk.net9".
 Warnings: null
 Errors: MSB4276: The default SDK resolver failed to resolve SDK "Microsoft.Android.Sdk.net9" because directory "...bin/Debug/dotnet/sdk/9.0.100-preview.7.24367.21/Sdks/Microsoft.Android.Sdk.net9/Sdk" did not exist.
 The SDK "Microsoft.Android.Sdk.net9" was successfully resolved by the "Microsoft.DotNet.MSBuildWorkloadSdkResolver" resolver to location "null" and version "null".
 Project "Sdk.targets" was not imported by "...bin/Debug/dotnet/sdk-manifests/9.0.100-preview.6/microsoft.net.sdk.android/34.99.0-preview.6.340/WorkloadManifest.targets" at (5,5), due to false condition; ( $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '8.0')) ) was evaluated as ( False ).
 Project "Eol.targets" was not imported by "...bin/Debug/dotnet/sdk-manifests/9.0.100-preview.6/microsoft.net.sdk.android/34.99.0-preview.6.340/WorkloadManifest.targets" at (7,5), due to false condition; ( $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '7.0')) or $([MSBuild]::VersionEquals($(TargetFrameworkVersion), '6.0')) ) was evaluated as ( False or False ).

The workload above (34.99.0-preview.6.340) exists, but it's not the right version. The right one is in bin/Debug/lib/sdk-manifests/9.0.100-preview.7/microsoft.net.sdk.android and the workload resolver never looks there. It's as if DOTNETSDK_WORKLOAD_MANIFEST_ROOTS we set in dotnet-local.sh is ignored?

VS.Tools.Net.Core.SDK.Resolver
 From Version 9.0.100-preview.7.24367.21 -> To Version 9.0.100-preview.7.24371.4
@grendello
Copy link
Contributor

#9124 fixes the app build issue

dotnet-maestro bot and others added 6 commits July 23, 2024 18:18
VS.Tools.Net.Core.SDK.Resolver
 From Version 9.0.100-preview.7.24367.21 -> To Version 9.0.100-preview.7.24373.6
VS.Tools.Net.Core.SDK.Resolver
 From Version 9.0.100-preview.7.24367.21 -> To Version 9.0.100-preview.7.24374.7
VS.Tools.Net.Core.SDK.Resolver
 From Version 9.0.100-preview.7.24367.21 -> To Version 9.0.100-preview.7.24375.4
VS.Tools.Net.Core.SDK.Resolver
 From Version 9.0.100-preview.7.24367.21 -> To Version 9.0.100-preview.7.24376.5
> darc update-dependencies --id 233463
Looking up build with BAR id 233463
Updating 'Microsoft.NET.Sdk': '9.0.100-preview.7.24376.5' => '9.0.100-rc.1.24381.10' (from build '20240731.10' of 'https://github.com/dotnet/sdk')
Checking for coherency updates...
Using 'Strict' coherency mode. If this fails, a second attempt utilizing 'Legacy' Coherency mode will be made.
Updating 'Microsoft.NETCore.App.Ref': '9.0.0-preview.7.24366.18' => '9.0.0-rc.1.24380.7' to ensure coherency with Microsoft.NET.Sdk@9.0.100-rc.1.24381.10
Updating 'Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport': '9.0.0-preview.7.24365.1' => '9.0.0-rc.1.24373.3' to ensure coherency with Microsoft.NETCore.App.Ref@9.0.0-preview.7.24366.18
Updating 'Microsoft.NET.ILLink.Tasks': '9.0.0-preview.7.24366.18' => '9.0.0-rc.1.24380.7' to ensure coherency with Microsoft.NET.Sdk@9.0.100-rc.1.24381.10
Updating 'Microsoft.DotNet.Cecil': '0.11.5-alpha.24324.1' => '0.11.5-alpha.24372.1' to ensure coherency with Microsoft.NET.ILLink.Tasks@9.0.0-preview.7.24366.18
Local dependencies updated based on build with BAR id 233463 (20240731.10 from https://github.com/dotnet/sdk@main)
Copy link
Member

@jonathanpeppers jonathanpeppers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are some network-related tests that failed:

Mono.Android.NET_Tests, Xamarin.Android.NetTests.AndroidMessageHandlerIntegrationTests.HttpClientIntegrationTestBase.GetString_Many / Release

Let's wait and see if these happen consistently, merging for now.

@jonathanpeppers jonathanpeppers merged commit 6adb4d9 into main Aug 5, 2024
55 of 57 checks passed
@jonathanpeppers jonathanpeppers deleted the darc-main-1cbd030e-62c7-4a7d-9015-6eb5791681f2 branch August 5, 2024 15:34
@github-actions github-actions bot locked and limited conversation to collaborators Sep 6, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants